tools-xentrace-prefix.diff

Patch-Name: tools-xentrace-prefix.diff

Gbp-Pq: Topic prefix-abiname
Gbp-Pq: Name tools-xentrace-prefix.diff

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 0bad942bdf794d2a11ee9d93c615391c0c4e9426..f803612c452b462a61f8f3ac42021866e8cd9ff5 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
 LDLIBS += $(LDLIBS_libxenevtchn)
 LDLIBS += $(LDLIBS_libxenctrl)
 LDLIBS += $(ARGP_LDFLAGS)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
 
 BIN-$(CONFIG_X86) = xenalyze
 BIN      = $(BIN-y)
@@ -23,21 +24,19 @@ build: $(BIN) $(SBIN) $(LIBBIN)
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
 ifneq ($(BIN),)
-       $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir)
+       $(INSTALL_PROG) $(BIN) $(DESTDIR)$(LIBEXEC_BIN)
 endif
-       $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir)
-       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+       $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(LIBEXEC_BIN)
        [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
 
 .PHONY: uninstall
 uninstall:
        rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN))
-       rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS))
-       rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN))
+       rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SCRIPTS))
+       rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SBIN))
 ifneq ($(BIN),)
        rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN))
 endif